From 0616fe033d40a5334fe18878e22b25d71bf82365 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Mar 2020 13:38:03 -0700 Subject: [PATCH] x11: Stop using gdk_surface_get_surface_type --- gdk/x11/gdkdevicemanager-xi2.c | 2 +- gdk/x11/gdkdisplay-x11.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 4699011a42..26adf00313 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -1865,7 +1865,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator, if (ev->evtype == XI_Enter && xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab && - gdk_surface_get_surface_type (surface) == GDK_SURFACE_TOPLEVEL) + GDK_IS_TOPLEVEL (surface)) { if (gdk_device_get_device_type (source_device) != GDK_DEVICE_TYPE_MASTER) _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device)); diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 040844b247..24e1636bb3 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -375,7 +375,7 @@ do_net_wm_state_changes (GdkSurface *surface) GdkSurfaceState old_state, set, unset; if (GDK_SURFACE_DESTROYED (surface) || - gdk_surface_get_surface_type (surface) != GDK_SURFACE_TOPLEVEL) + !GDK_IS_TOPLEVEL (surface)) return; old_state = gdk_toplevel_get_state (GDK_TOPLEVEL (surface)); -- 2.30.2